am: 526ee8da -s ours Change-Id: Ic54b4dccd5aedc6cf7d56fe9e8c4b64cad0b6908
mentioned in commit 2d31e635