Merge changes Idf2c9bd8,Iec48362f am: 31145f453b am: aed7645e62

Change-Id: I59f9733ce935436af6559a9fa2ed28a74b5f3682