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

Change-Id: I07cbecada20685467da9b82e101b7591ec285533