am: 0379c4e7 -s ours Change-Id: If9f36e1676204f79d62e9819afa0c2d26ad389d1
mentioned in commit 8afcef82