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

Change-Id: I35bcc265d3ff43e47c496089ade7ad8ac4d252cc