am: 6bc2bfed -s ours Change-Id: I34d92534a1d3f42ba1d58983e53f658b4ddc3593
mentioned in commit cdd03739
mentioned in commit fe5a72ca