Merge changes I9ab41b56,I61e4ca9b
am: f246ec6ae0

Change-Id: Ifb4a798f681aa5b222a71a43ee1e70c1994b1e76