More fixes towards the race conditions in AMS

Bug: 142986887
Test: Manual
Change-Id: I6e0bdc8c02bab54f6278096b3a3acadd97c064c6
1 file changed