am: e446d85d -s ours Change-Id: I4d5f899dfc54802c9832c43f27198386b27ef9e9
mentioned in commit dfb51372