Merge changes I8b20e03c,Id1ef4ab5,Ie34adb8b
am: 6982bf4bde

Change-Id: If80460dad9656f1bdad492a951f1e7247799e7b1