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

Change-Id: I445af6174e7f9b0d35e26a6b33feb925e3bc3f66