Optimized mounts

Change-Id: I061840ce22db5562c5dad319492d6beb5f3e3e2f