Merge "Add support for customized network list" am: dad5a5f5 am: 576fa81a am: f7016709 am: 62d67830 Change-Id: I060f495b2bb7294748b61f0369721a66e341476f