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

Change-Id: I5ad966202a2e1f4a2bbe73d4e9a160d19219198d