Merge "Handle idle->loaded state transition when loaded->idle is still in progress" into nyc-mr1-dev am: 10da5ab24c
am: 09f0d2c3e1

Change-Id: I4e6c6b21dc4463adcf5c2361224135641c3b48fc