Merge changes Ib4f6b1b4,Iac340c25 am: 4c0eb48014 am: 29f2fedccd am: 3627f9aded
am: e85fa64f78

Change-Id: I469d1fff56ac81da34d81dec2b7b8bc1996b5c21