Merge "Revert "Fix issues due to updated toolchain.""
am: c926e2623d

Change-Id: I6a662d118b43b4b21af246fc6b93bae09f0db40e