[automerger skipped] Merge changes from topic "del-factory-and-networkagent-wifi" am: 97cc9b621a am: 3060c3cd98 -s ours am: 53defd6b08 -s ours am: b2e6f572c7 -s ours
am skip reason: Change-Id I4eec40bed93679a029a20d38c114b1dbc80aa12e with SHA-1 a0d43919ba is in history

Change-Id: Ifd718f2a25787b8d599a182eaef4ebec5bdc0aab