am: a5f77b68 -s ours Change-Id: I5c5fdf0583705cc07c096d34a46152a5b07d67ed
mentioned in commit 79c4a10f