Merge "Merge "Replace CTS with CDD in comment for FEATURE_VR_MODE_HIGH_PERFORMANCE" into nyc-dev am: e54b439 am: c25b1e1" into nyc-mr1-dev-plus-aosp
am: fdd1f38

* commit 'fdd1f384dfc160a207b08168bfeb09d4ee39096c':

Change-Id: I666c9c7b4c02977142d8faacfee4d74739d031a2