Merge remote-tracking branch 'caf/LA.BR.1.3.7_rb1.8' into lineage-15.1-caf-8952