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

Original change: undetermined

Change-Id: I008a985aa9e8d3ca37efe320353e3225b44bf49c