Updated BOM for r3.5.
Merge.