[automerger skipped] Merge changes from topic "del-factory-and-networkagent-wifi" am: 97cc9b62 am: 3060c3cd -s ours
am skip reason: Change-Id I4eec40bed93679a029a20d38c114b1dbc80aa12e with SHA-1 a0d43919 is in history
Change-Id: I9ef0d966631f1fbdea09d0e443bbe42c541bd6c5