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

Change-Id: Ifb3a7f2c6715cfa9dfa9c564687c54ebe1257d36