am: 5691af88 -s ours Change-Id: I81983a4cf2160560059756c84af42ad550a436ae
mentioned in commit e41a94b5