Merge "Update optics" into oc-dev am: 0a9e585fe2
am: 35f1d1f0f2

Change-Id: I2fc9dbc7f26f3bbbd2cd37edf85982318f58e121