Merge "Fix null pointer exception when checking whether to hide VVM settings." into oc-dev
am: d783bc739e  -s ours

Change-Id: If604b0663382e7b9d5ef21b78d75624124537846