Merge \"Don\'t accept resource references in string fields\" into nyc-mr1-dev
am: 6fa0e4d518

Change-Id: I8bc05f17694aca0c24e280daa2fcd8464aa1fd05