Manually merge commit 'b406ffa' into stage-aosp-master
am: 04c55e6ed7

Change-Id: I77bbb46dfd8f49ed96c3f590d719b511eff55aa6