am: b2641a8f -s ours Change-Id: I893baa15f6af4679b0e346addc9f5b37483d8fe2
mentioned in commit 13bf16c3