Merge changes  into stage-aosp-master am: 1a63bcc0a5
am: f9410cafec

Change-Id: I2f147946ac2ea928137a23b96dacc7c44d6bf40a