Merge "Move sensitive field parceling bool to constructor" am: ab5fdfa7cd

Change-Id: Ib5619a2173d838e81091415fe6323370f61c9461