Merge changes from topic "vts-secure-only-camera" into rvc-dev am: ec37ce4947

Original change: undetermined

Change-Id: I59590798e81bf9f87ef3d598aa333cb89a13dbbf