Merge "Updating Overview to work with PiP" into oc-dev am: 0553cbcf36
am: fbdd98ef69

Change-Id: I54bac22c4c5963773d886e9f18da8f90b4aac2a6