Change-Id: I493e3dc3782608e4d0d712569a6e6fd3b376cdbe
Sync with the latest changes from upstream repo Change-Id: I309880f5c7f77c58a8b186db320bbc0f0e634089