Merge changes I2dd58db1,I6cf55ad4
am: ecfba0c358

Change-Id: Ib2e78c419917991cc1e6c6f055af8839172bfe22