Merge changes I7add6dff,I0249f758
am: b42dfa745b

Change-Id: I7c8544215b13db8440c4a72671996da0fac3be2e