am: a6b6395b -s ours Change-Id: If37e3e31ae186503197c8664823ac93bd40fccdf
mentioned in commit 85f6cdc4