am: 940c6774 -s ours Change-Id: Ieb4e7fdba2b7269690976748e6643626162e145c
mentioned in commit 6037f0b1
mentioned in commit be3b51d6