[automerger skipped] DO NOT MERGE: Fix Morocco to use rearguard format...
[automerger skipped] DO NOT MERGE: Fix Morocco to use rearguard format correctly in ICU. am: 44ebb70e -s ours
am: 90020d67 -s ours
am skip reason: subject contains skip directive
Change-Id: Iee44e8991af5b25af2936564630e926b43161116