resolved conflicts for ba95966e to stage-aosp-master
Dan Willemsen authored
Change-Id: Id468b025222853e5a421300b6e669de999bf737e
3cf0775d