Merge changes  into stage-aosp-master
am: 39c76107bd

Change-Id: If60b6361f323c651510900344d75ce5fa7db17c3