Merge "Clear alias name when device unbond" am: d66b462e29
am: 7820e2cb9a

Change-Id: I54fb3039a03cc4423c5fff5bd107496f3347da71