Merge "Removing unused intent extra" into nyc-dev am: 7a3bff1
am: 13638e2

* commit '13638e29df8a031c787e809ca9c62f303a7013b6':
  Removing unused intent extra

Change-Id: Ic61e004a36124515eb7d0cb4e24b85d9d5370116