Merge "Handle idle->loaded state transition when loaded->idle is still in...
Merge "Handle idle->loaded state transition when loaded->idle is still in progress" into nyc-mr1-dev am: 10da5ab2 am: 09f0d2c3
am: 6011acd8
Change-Id: I0ffdc054b857e67f4e1f18c187ed5f7f10fb4d81