am: 8979b83f -s ours Change-Id: I50a2aafaa9380ab1070575192a4610a45180aa8e
mentioned in commit 9e275c91