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

Change-Id: I9c4d53f0c1d73aff3fbf6ae48de0244f75ed337f