Merge changes I9ad08b0d,I7fb1ef4f,I5b24b9d9 am: 895c13fe22
am: cdf756db46

Change-Id: Ifa223e1cde534e6dece7d42a519a9f5b95a79337