Merge changes from topic 'am-05b31ca402aa48759253cd629049d899' into oc-dev-plus-aosp
* changes:
Merge changes I0286459f,I9450743e,Ibf1efea5,I48325500,I2bd36929, ... into lmp-dev am: fc9d732ca6 am: 591a49b3a2 am: ee89cfbe7f am: e02fe54175 am: 558539ff17 am: d8d9b6d874 am: 2c75b48f97 am: 3aa8146eae am: 9d3aaf2517 am: 86a7020b90 am: f16b348b93 am: 8fbe1f6c2a am: 2b9cc8459f
DO NOT MERGE: Heap buffer overflow in xmlAddID am: 188e4b516f -s ours am: da1480747f am: ce2a7a6fad -s ours am: f33d4022b2 am: faea71fde1 am: 1b65eea994 am: e66bb5b014 -s ours am: 4d4b02988e am: f9e4a7584a am: afff933549 am: 39b86a2b87 am: b7ac692e29 am: 9af1e05d57 -s ours