Merge changes I0c8d4018,Ic9dfb243,I7e442b06 am: 17892731ec
am: 6079aa6a8a

Change-Id: I975c3b4caee67b007b0fd9d435bd026494fc3dff