resolve merge conflicts of 9414ec081 to stage-aosp-master
am: 13d685964e

Change-Id: Icfaa5b8fc380d3a5f0eb64349b638faf8e86c085