Merge "using the correct intent extra for subId" am: 45db25d742
am: 1ae9d0bced

Change-Id: I4cf3ea508f0f06ecbf41216e5ea142b5fc1b5007