squashed completed bring up

Change-Id: I6b70dd5299ab6631fde7532615f45c6f60060a88