Merge changes I61fd754e,I71bdc5e2,I1371b9ca am: c3d8566699
am: 956fce5b2e

Change-Id: Ia25109c1a046e9a5f5e197b215879cc3d4be01e0