Merge "Add feature flag to enable skip direction mapping" into qt-r1-dev
am: 79f7ac9922

Change-Id: I1f4561a0a1104fb64b763fc168f10430b449098f