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

Change-Id: Iee60a8e32c907832cdb54a545f6a07518804f6bd