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

Change-Id: I800949f7c1815eaeb6addd9e297154d977ed897b