Merge "Reduce WarningAllowedProjects." am: c92168f08d
am: 9741b57ad8

Change-Id: Icc65557994c26bf2b75b80d533e44213e3590834