am: 7593cdaa -s ours Change-Id: If61055c910fa282ace7a506cee0a6b99f352d221
mentioned in commit f6aec106