Merge "Fix issues due to updated toolchain."
am: 13ef0447b4

Change-Id: I6a11326c5405e23bd2c6af0da3f5a1979e6a0083