Merge "Visual changes to dual target tiles" into oc-dev
am: ec9afcd4c5

Change-Id: I3efde6087bb26ec580e0f685fa11687d7ce48ae1