Merge changes from topic "cherrypick"
am: c4b647458c

Change-Id: Id372458d932eb34db2f7cdc5bc25159f65f1d93c