Merge "Fix for AOSP force virtualization mode" into lmp-mr1-dev