Merge changes Ie9dd5d5d,Ifc6038c1
am: 0cde0eae09

Change-Id: Ie402e720388b35daed0f704992686f4b84bc5736