Merge "FIxed typo." into oc-mr1-dev am: 683064f605
am: e238529c8c

Change-Id: Ifc996508d15b210db18e9d025a219b065b9b5443