Merge "Switch from getActivity() to getContext()" into nyc-support-25.2-dev
am: d879d7d784

Change-Id: I660edd64c9a2abe0e485152dd5c70c475dd63911