Merge "Merge changes from topic 'camera-tron' into oc-dr1-dev am: 280165118d am: 7dcff07a28"