Merge "Add more patterns for a finer project warning list." am: 8ef4397c22
am: fd9558d09a

Change-Id: Ie719e23ebb0b3e527fe7823fdce54e8a7c296e29