Merge changes Id2a61d35,Ibe802c36 am: 3cf9f9b838
am: dff1cef8ae

Change-Id: I45fb75c1422cb21608f6fa4bcb5118be7d595d74