Merge "Auto-dim refinements" into oc-mr1-dev
am: 2806975bfb

Change-Id: Ica3ebd5b227fbe9e4bd4b3699f54176d166f6dda