Merge changes If9782396,If033c815 am: 5e148a58b8
am: 8e0c8c0dec

Change-Id: I3de93a4305b567d48e103fd7df78d8effcbd365d