Merge "Change instance name to default in multihal 2 xml" am: 724b7471e0 am: c3f2745aae
am: eba6d2429a

Change-Id: Ifbbabaee01f39c79f395408c2d29764541ce8e46