am: e9dd0127 -s ours Change-Id: I7f37fb95c36b48d22cb68f89cb5d87f6f487ce63
mentioned in commit dde4afc2