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

Change-Id: I80623f0f471b7c206da24fd7347dfb472a156ab8