am: 21989288 -s ours Change-Id: I1297211629a0a36fceeffcd4007d4295de383b74
mentioned in commit 9b38d90f