Merge commit '0a9d537f' into manual_merge_0a9d537 am: df42d732 am: afcd1135 am: fc1c0f9d am: 33ada2e9 Change-Id: I9b6d2b6f9101e7e7610f191cd4927d568ae0476a