am: 217abbf0 -s ours Change-Id: I6d436dbffa50417b919a4c7915e94e478f82bb31
mentioned in commit bbe1b89b