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

Change-Id: I95636e962b9994bac5486f1b4f4706405e08ed79