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

Change-Id: I2d949065a54aa1f6fe0109832ea86a4a7e049eb2