resolve merge conflicts of 24e38ab to stage-aosp-master am: 621fb590e3 am: f929ef6cbd
am: e986be325c

Change-Id: Iba2e6cdae0ef4c651015dd283718ca5b011d5c0b