Merge changes I9ad08b0d,I7fb1ef4f,I5b24b9d9
am: 895c13fe22

Change-Id: Ic181af43c1f64e97aaf4d29b4e36f71227cab199