Merge commit 'dfd0b0d3c75bf46849a387b5a0109bcf17308bdf' into manual_merge_dfd0b0d
am: 524301ddc7

Change-Id: Ica471443f6722125cc8e7c46f6faec755f2a5f91