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: aeccfa4d
Change-Id: Id136f6aa65c173eefdd9dfd548bf4de5e0912397