am: bd3c8fd8 -s ours Change-Id: Iaaf907b6ad1b67cb1e0a9659922f0fd24aa197fc
mentioned in commit 3ed76b73