Merge \"Fix intent flags\" into nyc-mr1-dev
am: 85e086248d

Change-Id: I916c680de263edaa7422b5c82da428b161de1338