Initial support for Oscar into cm-10.2

Change-Id: I41dae0a4fa418da7e4610b1bb5bc90a1b587bf22