am: 42a8b92e -s ours Change-Id: I1199856133b68e097add206c1b88558667850c8a
mentioned in commit 62c6ee48
mentioned in commit f48a3ad6