Merge commit '3f4e5c4563068f277141f5fb3d96ec02afc7ac95' into master

Current code contains a compile error after compiler update.
So merge from upstream to fix it.

Bug: 149839606
Test: checkbuild.
Change-Id: I8711e506e36898f1f74f186325b505de11eb2c54