review VAP-3

Change-Id: I286ebba023f0a9c8d6e68d62f0022a6e7c916ff1
Merge "review VAP-3"