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

Change-Id: I3cdc3a4949ce9636dc3d4b5e5075ccf30f4b29d5