Merge "Idletimer-related commands porting" am: b6b8516ba0 am: db4dace06b
am: 7dc352c223

Change-Id: I75b8501b35116e907a791f475f90b1f0928c537d