Merge changes from topic 'cherry-pick'
am: e3d5fa1094

Change-Id: I73321476de15f230ba19f04a5561238f0567eb9a