am: 57c640db -s ours Change-Id: I4e62a543b19315987c04c23fc976a446a7bb053e
mentioned in commit 0027792e