am: fbcfc4e7 -s ours Change-Id: I9ae00259286ae7bf9313162bb7f6f9985851198c
mentioned in commit b1afcb78