Merge "Fix compiling with javac" into oc-dev am: efd48d488e
am: 232684daae

Change-Id: Iea5980478b4acca8b8c1d71da5b357554dac4de4