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

Change-Id: If58936655f96e2b23d9e6c543aafe33b8ecec32d