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

Change-Id: I6d1ee4108b0bed906ff71f29f6519dbf9da6e775