Merge changes from topic 'libACRONYM' into oc-dev am: 9eece058d6
am: 0852506624

Change-Id: Ibc3924cce54bcf467b1b17fbd9725b76254b5cde