add vapp-based lock

Change-Id: I945b47b142e44485c63200a8c9f8b3ba9b65e776
Merge "add vapp-based lock"