Merge "Move sensitive field parceling bool to constructor" am: ab5fdfa7 am: 28c13929 am: 3f018fc0 Change-Id: Ida9f0505957c3bab1657f873699af26ab93f261c