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

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