Merge changes I3872dc51,I3b185f68,I37a25ca7
am: 956c204f1e

Change-Id: Ic4b4c289948d7c8e0c6377e9afac30a697532d26