Merge "Remove isHighEndGfx check" into oc-mr1-dev
am: 848fa6c253

Change-Id: I5eb3772ad2d0c894f17e620960ea1ff3715bb499