Merge changes I2c8b84b6,I0ce00cca,I78a83448 am: 08c51d9f2b am: 4ae4793721 am: 9caec6b454
am: 287fad90c6

Change-Id: I915bf58df63ed6552ea8593d62d8eecf015be3e2