Merge commit '03aa215cccab68da5fdfe000029201982edebe68' into stage-aosp-master.
am: eb7ba88b5b

Change-Id: I1c577ee17ec238f73ed19a3657fd8ef10c102ef2