Merge changes Id48b8cf6,I6ecf45ca,Ic672706d
am: 3d786f4e50

Change-Id: I196f7365662c9158b22791e0a563d83e038c8773