Merge changes Ib2ff7e44,I950d614d,Ic87c2f8e into stage-aosp-master
am: a293fbabf9

Change-Id: I1abdea04fd5175e32f0a417f31b7accb470d920f