am: 86078822 -s ours Change-Id: I599c00e3252ed717e178cd10910852db8164e3d3
mentioned in commit c81783b0