Merge "Retry mounts on -EAGAIN" am: ccb06c7b2b am: 4a8d70cc8a
am: a4825bd6e8

Change-Id: I25407825bc60c9898eec952e6158d30648741f34