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

Change-Id: I4dcdc5c279b09846a2806fd5a51496441eaa3838