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

Change-Id: Ib92a19bce9fd9086c302c2cf4606b5d10161fe85