(cherry picked from commit fe75dbb7)

Conflicts:
	cui/source/customize/acccfg.cxx

Change-Id: I967ed2b4b7b3c9dfeebf07af544216afc8bead8d