Merge remote-tracking branch 'caf/LA.AF.1.1_rb1.6' into cm-12.0
m7: enable idletimer netfilter config