Merge "[DeadLock]AMS PMS MountService" am: 998ac99db4
am: 41fb54b955

Change-Id: I15056a18d70a1d17c52799f71e8faf5c565bb8aa