Merge changes from topic 'am-05b31ca402aa48759253cd629049d899' into oc-dev-plus-aosp

* changes:
  Merge changes I0286459f,I9450743e,Ibf1efea5,I48325500,I2bd36929, ... into lmp-dev am: fc9d732c am: 591a49b3 am: ee89cfbe am: e02fe541 am: 558539ff am: d8d9b6d8 am: 2c75b48f am: 3aa8146e am: 9d3aaf25 am: 86a7020b am: f16b348b am: 8fbe1f6c am: 2b9cc845
  DO NOT MERGE: Heap buffer overflow in xmlAddID am: 188e4b51  -s ours am: da148074 am: ce2a7a6f  -s ours am: f33d4022 am: faea71fd am: 1b65eea9 am: e66bb5b0  -s ours am: 4d4b0298 am: f9e4a758 am: afff9335 am: 39b86a2b am: b7ac692e am: 9af1e05d  -s ours