Merge changes I916c680d,I55e7c86c into nyc-mr1-dev-plus-aosp

* changes:
  Merge \"Fix intent flags\" into nyc-mr1-dev am: 85e086248d
  Fix intent flags am: 7e5c3e8542