resolved conflicts for b15e1ff5 to stage-aosp-master

Change-Id: I28a843a94855193d4b90dc9bec028eb5338eeed7