Merge changes Ifc661bd2,Iba4ed7be
am: b2ed3ee88f

Change-Id: I76a2e76aee12ebde2e48a72e4569c2238de274f9