Using my own projects

Change-Id: I4450ad5f97dd0b090b4fb540663e2bd528ced2cb
Merge remote-tracking branch 'origin/newoxygen' into newoxygen