Merge "Based on the discussion of ag/3818243, this is the initial list. The...

Merge "Based on the discussion of ag/3818243, this is the initial list. The reason to repropose this is because of some changes like ag/3619568. We don't want to allow this happens again." into pi-dev
am: 7d135772

Change-Id: I686fd6899993395e722713bc06f0bdd4ff2db8c1