Merge changes Ia74dd04d,Ib6a6d3fe
am: 6590b8f4bb

Change-Id: I7aaa087ebaac6a8ea1f8d6ca778263e6531cc59e