Merge "Setup idletimer for network interface." am: 5f4cd1dfef am: fdb4349bff

Original change: undetermined

Change-Id: Ia83e549a63587b6f8369f72b64e429c86c357a47