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

Change-Id: I8bc83a97a9d6940bbfbf462b8b6a5a32901bfc26