Merge "Replace Nullable bundle with NonNull and use Bundle.EMPTY" into rvc-dev...
Merge "Replace Nullable bundle with NonNull and use Bundle.EMPTY" into rvc-dev am: f1771c0d am: 12a7be98 am: b6ad7232
Change-Id: Idfe33b3678b8fbc3bc158ab557f532ee43bada81