Ensure no diffs b/w oc-mr1-dev and ub-launcher3-dorval-polish2.
am: fe8a39d8b0

Change-Id: Ie08c5fff60928bf306415848440fd3cf3c42840a