Merge changes I73ae8de1,I58260902
am: 6f11744adc

Change-Id: I9b47ae1d3953280a627584902b3bc099e1f907c8