Merge "Be more lenient when processing group headers" into oc-dr1-dev
am: 693179307c

Change-Id: Iccf9df3cf1f15aefd88b8cb77568df1a00e52e21