am: 2aaa71af -s ours Change-Id: I42c619beb67f49a619d84464052ee79841c93f3c
mentioned in commit 132dc17b