Merge "Rename headless system user flag to under 32 chars." into qt-dev am: 7f39f77d6c
am: 427347cc23

Change-Id: Ie058734c81a952d8554d953c72bac92c43eba23b