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

Change-Id: I4c0fb646b7f2593cf579b0958fa1222dd1c55864