(This implementation has EXTRA-FLAGS option.) norefs Change-Id: I456b89ce8a7b2624b0196013527682fce13078e6