Refocus integration phase 1.

  Bug: 9966846

Change-Id: I591ce1ee878a9f4d6bd63eddef6e79608ffd69ec
5 files changed