[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: c44dfdf5b2  -s ours am: c01a882b1f  -s ours
am: 7b8fb0615e  -s ours

Change-Id: I494203f629a6eb507a7b45c28166381765aa74d9
tree: 0b71c9fd458e7b441005b6a96dd519b445acf241
  1. hal/
  2. ipacm/
  3. ipanat/
  4. configure.ac
  5. Makefile.am
  6. os_pickup.bp
  7. os_pickup.mk