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

Change-Id: I9bcb0559d2d2ae65b303d81de14886190ea93229