Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843 am: bc6a65ca32
am: 951e9b7742

Change-Id: Ifa44c34f2653e6e1146a9a6337f411761cc1ce17