Merge "Idletimer-related commands porting"
am: b6b8516ba0

Change-Id: I48997db764885415f952520c5a29c5da34327e39