Merge "Fix default optics" into oc-dev
am: 87c83b1de4

Change-Id: I313cd0190cf3c38bfce6b94f3ee86824220f6770