Merge changes Ied6a13be,Ia4818f62,I660a4384
am: c7483ff8bf

Change-Id: I190ba084943f40e29e650bf7375a18c315c4592d