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

Change-Id: I355c7afe8bcc9407fbeba84d9c0cb00336759d30