Merge changes Ifb1b550c,Ic7377efc am: 11f8b20068 am: 360cd76695
am: c6b19d743d

Change-Id: I52369d76de42ff930f22dbcfcb54994024436a06