Avoid implementation-defined behavior am: 99d91d18f9

Change-Id: I2711f7fc6c26e19d2b54a997858d51d74eec92c9