Merge changes I4077bd6a,I92c4090e,Iff579600
am: e9539eb02f

Change-Id: I28748a1f0a3e797ddd4bc76adc19f2ea308a70c8