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

Change-Id: Id938e5cd15852144fcce2367c4fac762f8cfc8ba