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

Change-Id: I2bb0b66360f2aa572be288a65b98fd0b76da85af