Make the right edge more performant

Bug: 9177552
Change-Id: I4250825bb658209166744ad1cb0455d4ac81da34
8 files changed