Merge changes I345f9bf5,I20f23f7f,I22720864,Ic43df22a,I3b1a630b, ...
am: 5b44f1f433

Change-Id: I828e4a9d130015eb8795498938294da957cfcd54