am: d3a9fb0c -s ours Change-Id: I09e154d6bae9e10e10b972afa86a00430bda2727
mentioned in commit 8bdbca06