Merge "Merge "Refactored CustomVirtualView to be more generic..." into oc-dev am: 490b7111 am: b17707e1 am: 3fce711f" into oc-mr1-dev-plus-aosp