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

Original change: undetermined

Change-Id: Ia8b7e2a402e95e00d32eb57926677fb1fa77d301