am: 4f788d08 -s ours Change-Id: I1d849ff86f15ed20af92f97a5ebe9455a997498c
mentioned in commit e09ca835
mentioned in commit e620b8e6