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

Change-Id: I8d6fa49ba23b78648cf43fafe7c290f2e0c4b59f