Merge "Update the smearing methods in framework." into oc-dr1-dev
am: 386d8133c4

Change-Id: I383384c1cd30e5ab4f88a5e95a9b0068e573fe2d