Merge "Program offload-exempt local prefixes into the HAL" am: de837a97aa am: ae21b89414 am: 17a62281e4  -s ours
am: 00c73c7784  -s ours

Change-Id: Iee7147a3f2a0e968d2154b623f741c738e5a641d