am: c657abcb -s ours Change-Id: I063a04fc7922c7cf1e8f78a95f7b46b4095de622
mentioned in commit b02c018d