am: 6d700b03 -s ours Change-Id: I9edd5c230a7b0f5662e1b73463c6780003265db6
mentioned in commit 56a691c3