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

Original change: undetermined

Change-Id: Ief05fa10bb48a8e117775512acb978b91b075e0d