Merge "Fix refactoring typo" into oc-dev am: 4566518ff2
am: 13f214916c

Change-Id: I2101b07da283ed93e4286947d5d3115646c509eb