Merge "Fixed issue that cannot bring My info via Android Beam"
am: 775103a3fd

Change-Id: Id079430968362b97f6fe1435c0d96eb7b62a13b1