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

Change-Id: I47f43921f2f18b0163c9e8eae1dd484402b53b49