Merge changes Ia3f19f0f,I0fe8038e
am: 72e80c66e6

Change-Id: I405ca87dee408648872722880b309342b44e86b4