Merge "Disable Android Beam" am: f5e0370a0d
am: 7ca17e94b0

* commit '7ca17e94b01059194985d3c3fe859f164fa555aa':
  Disable Android Beam