am: e8439367 * commit 'e8439367': Don't overwrite vertical and horizontal offsets unless explicit Change-Id: I9cd87f63c07748ba4d53b1e8326900c1efeb04ee