Merge "Fix issues due to updated toolchain."
am: 37f84f4e54

Change-Id: I89cc5dee48ad1df6d3edf2fce6ad03cb8de687c6