support VID master and casabalanca branches

Change-Id: I0cacbc797bdc9fc810674f12a55a9f87272ebbd5
Issue-ID: VID-334
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
1 file changed