Merge "fortify(poll): emit diagnostics regardless of API level"
am: eb9775d36f

Change-Id: I558672fefb47ce5ca0e10772223eb8be1fd6ae1c