Merge changes I4f181789,Ia8a0c99b
am: 6efdc4a6cd

Change-Id: I50207fe29953be7759bbd01cb93268202067f764