am: c659a45d Change-Id: If200e8f2c07c2333a9acd050be672f573a0c3e32
mentioned in commit fb3c75d7
mentioned in commit ce46429b