Merge "Fix stupid bug." into oc-dev
am: 36fd25eec5

Change-Id: I096332ea215a70f40da85cfbdba1140eb770fef4