am: 57aac74d Change-Id: I0c3000351c19160cfb83e508e009a9d072b3b349
mentioned in commit b02255c8
mentioned in commit 52af2c81