am: f4dcfc8a -s ours Change-Id: I8105beb38e80249904aaff5b88747dd0fc0fce7b
mentioned in commit d289d06b