Merge "Make sure SELinux labels are correct after move-to operations am: fa7d97fa15 am: 4b96358fcb am: cb9705d833"