Merge changes from topic "cherrypick"
am: c4b647458c

Change-Id: I5c69ee7c8a6bbdff508a506615e184b85fa20084