serrano: Fix PROXY use cases

Change-Id: Ib642e1ba58a44374f2a14de9fd9acadc089413ce
Merge branch 'cm-11.0' into kk_mkt