Merge "DO NOT MERGE Fix security exception due to incorrect flags" into pi-dev
am: 9f1885dee8

Change-Id: Idb0ba52a58231ce9ede97b158a1cb38d1a9633ae