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

Change-Id: Id81327f4a59febd57c982d7677f7fde9497a0ce6