Merge changes I96d1acb3,Ief00af72,Idf8f4a0e am: 3d85fc6954 am: 33c978d09d
am: 68c6b4bbe3

Change-Id: I2d9ed079a4e88942b9b8af25c59c739ca9fc7001