Merge changes from topic "recognition_service-mnc-dev" into oc-dev am: 714fb7ae84 am: 7915ba5c9f
am: 7213adbb7f

Change-Id: Id562b135ce25665b120e48a2c76d88587e48f125