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

Change-Id: Ib59dac3c538adc4126e981309ddf6ee3ce56e42d