Merge the SuperUser feature branch into int/n/fp2

* origin/dev/n/FP2N-175:
  Introduce conditional for building

Issue: FP2N-175
Change-Id: Ideee3cccaa6af827180a324ae07e26164d5ec0fc