Merge "Fix intent flags" into nyc-mr1-dev