Merge changes Ib55c7d35,Id75e1f50,Ia93550b2,I60bac5c2,I00c28aa0
am: edf188ad95

Change-Id: I51219cbc0a4549ba72a32b181815e7ac62da1d8a