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

Change-Id: I50431bf8822c98471daa6c2473c3741f338b9601