Merge "Merge commit '3a74ee528255cc027d84b204a87b5c25e47bff79'"
am: b469bb31ee

Change-Id: I810ca976d79c1e927a99f436e8d4581f3e189f1e