Merge "Increase resolved classes save delay to 5s"
am: fc1361d322

Change-Id: I382f4292dcbaa7cee4bdd755404a9f87b437ffa1