am: 5687e7e6 -s ours Change-Id: Ia29b0a130d80d4f7e5b31ca343878275459321b1
mentioned in commit b9777871