Merge "ART: Fix BCE lint issue" into mnc-dev