reorder and add # Camera flag

Change-Id: I15d588b44c43d46e0b10610a4057221898ea9f7f