Update development to oxygen_1006

Change-Id: If23aa49cc06cf727f3a96a392d1ee88659b4cbe6