Also fixes the position. Bug: 15757197 Bug: 15545213 Change-Id: I9fab98652ab1ccad4e02d5cfa17b212a72a0a0b3