Merge changes  into stage-aosp-master
am: c03f142630

Change-Id: I4e707c0172a858db97d903ad79dadb37c7a910a7