Merge "Reduce log spam when unmounting /data"
am: 07892ea610

Change-Id: I4173e8eb101bee8affa77ce9e6b5bafe3181d1bd