Merge changes I552122d0,I9171a5da
am: a679cd7227

Change-Id: Id8b8e642ef124fa03a187c5773bb7d90c975e858