resolve merge conflicts of a4398c1 to stage-aosp-master am: 195669febc am: b2ab1c43cb
am: 7948a33f2c

Change-Id: Ifeeac2d6aa9e1c36477599db0edf0e5158473555