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

Change-Id: I7502e4773b318c95f7918af7a316420fb959344c