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

Change-Id: I9552ec1014eb1322b42d6bf22a9fdac724c11ae0