Merge changes Ia0ca36fc,Ib42c0635 am: 1abc3cd641 am: 695e6182d3
am: fa807c7cad

Change-Id: I9ece6f1ce09097d93fe46d07c323c4dd6977839d