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

Change-Id: Ia0a4ca26936236c5ca5a1dd90b32211a8cfc761f