Merge changes Ief3dbf8e,Ib06e6f65
am: ee0e63f71d

Change-Id: I9fa7bbac32f6156823a6a5aac7e0e401c584607e