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

Change-Id: I7a77d5b16226fd1bea9f37623af8226255742dc6