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

Change-Id: I3ec33adf894393b43296e83b450f3a894785fc92