Merge changes Iad6ba65e,Ia6a7e8c9,Ida9405cb
am: 037d2b71dc

Change-Id: Idcd64fe03a983227c328618216a582dc8ae76b8e