Merge changes I44289a3d,I0537453b,I23a655b1
am: 7928afb83d

Change-Id: I9d9b429bb855e0051bfb26ddc01453c7221fce23