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

Change-Id: I512e780496b4f9d6c60714de06ba1705a1ca1ca3