Merge changes from topic "sysui_flags_drop" into pi-dev
am: 53ae6a82cd

Change-Id: I88661e52aedee934e5b5cdbfd1d457d2c6a7d1c1