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

Change-Id: If7e63fa885affbdc6649fb70636e20de85484a98