am: 245b5d78 -s ours Change-Id: I46c0b565001101ab63e518511b0fa9959e462086
mentioned in commit 90567c1b