Merge "Fix array size for hrd parameters" into lmp-dev am: 9297a40b62 am: 12dd7731b5 am: 51aa4397cd
am: 67445c2c08  -s ours

Change-Id: I04d8c5c9c191600821028ef0a630a46da583fddd