Merge changes I3d68dbf8,I6ea524bb,I978d9119
am: edab226d0e

Change-Id: I6ffc0a841d0aa8479bb5b6afba49c5130af879da