commit for task VAP-2

Change-Id: Id94a4bf76134e9222228fdcabc104b1af49c8bad
Merge "commit for task VAP-2"