Merge changes I172acf0f,I97b6e17a am: 4963b42d7b
am: 09b0da7b10

Change-Id: I8edeebf3761089176b64cee64c1b74b29756d7e2