Merge changes Idb6ef31d,Ifb87ebae
am: 205f1435e8

Change-Id: I13cec0ec7446d6abb0b6f2dfaf58d0da4ae6bf0c