Merge "Fix/suppress error-prone warnings in framework's fragment." into oc-dev