am: ee34115e -s ours Change-Id: I5c483964effd6e45256f7aa6b58750b41e4e3ec1
mentioned in commit 1f069689