Merge "Update enabled networks entries on rotation" am: eaa79b2866 am: 25b087e7f8
am: f16111474f

Change-Id: Ib84d332de4cd4a2976bfd7867e9fe5527fa3ad29