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: 526ddca9 am: 88e44b17
Change-Id: I30ee4b7065b72757c0cf8dce5ab7806178212f5c