Merge changes from topic "wipe" am: ac80c040c1
am: 47532be9df

Change-Id: Ie2687176a9a7c848be9dec950d151b9c36e71e74