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

Original change: undetermined

Change-Id: I7428b76dc741998cd79ec4a457e4c37b0d2521fd