Moving instances in the same place within source code. Bug: 141833767 Test: build pass Change-Id: I350604a64a56151195f52d38bd258e34c76e40c5
Moving instances in the same place within source code. Bug: 141833767 Test: build pass Change-Id: I350604a64a56151195f52d38bd258e34c76e40c5