Merge "Add more log to track down the "idle until changed" issue." into oc-dev
am: ba5c2d3e44

Change-Id: Ibf74cfc80511d6167c134d7e86e8e59921dc90c7