Merge changes I7add6dff,I0249f758 am: b42dfa745b
am: 8bdeed59aa

Change-Id: I335f3e5f617add8bdbfc6e5c0bb6a0eab80f4f9a