Merge changes  into stage-aosp-master
am: 4da9f2009a

Change-Id: Ifada0acd374477fc5ecddd7bed8c4dc800cf5fb4