Flag Basic Concepts for removal and clean up Policy section

Change-Id: Idbda1bc12d3961407227b1267d80f12ff6009dfe
Merge "Flag Basic Concepts for removal and clean up Policy section"