[automerger] Revert "Fix typo in horizontalShift" am: 33cbe61e97

Change-Id: I3c9aa98e9d319c2b6ed05fc6bddc2bd2251f67a3