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

Change-Id: I562b77c500a7a73e9549124f0f2882893a2b58d0