Merge "Added missing fields on virtual views." into oc-dev am: db30f62f am: 364bb06c am: 73832148 am: fad5a6d9 Change-Id: I1b60eab14bc14ac5c056009ff00d791b84a368b2