Merge "Fixed compile error caused by final keyword" into mnc-dev