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
am: 5731a280
Change-Id: I849164acb220fe4e2fce1dd2378d9d1919c1eeb9