Merge commit '3f3ed24' into stage-aosp-master am: e9b6029153 am: 756cbb248e
am: e500e63cc0

Change-Id: I2081c82b569d21b7fceb446ee82f67410ee17266