Merge "Replace Nullable bundle with NonNull and use Bundle.EMPTY" into rvc-dev am: f1771c0d33 am: 526ddca90c am: 88e44b17d7
Change-Id: I30ee4b7065b72757c0cf8dce5ab7806178212f5c
This commit is contained in: