Merge "Added missing fields on virtual views." into oc-dev am: db30f62f am: 364bb06c am: b8905133 am: f16f9fb9 Change-Id: Ia9582941c631aecd7f20ded8c9399f2ec760a3c0