[automerger skipped] DO NOT MERGE: Make NIAP a Global Setting toggle. am:...
[automerger skipped] DO NOT MERGE: Make NIAP a Global Setting toggle. am: 780269e4 am: 0988c60b -s ours
am skip reason: subject contains skip directive
Change-Id: Ib73113212167302635b28d1c414528359e5cb65f