am: f1d4a495 * commit 'f1d4a495': Fix comments since we are keeping grey-list in N Change-Id: If8dff6fe47514a1906720e24a82ed3ea91c25b9d