Merge "Fix possible NPE" into rvc-dev am: 1d63b6c88a am: 0c4c77c4e0 am: b0e4a45947 am: 49a0de860c
Change-Id: I1fa825efc7daeae366c6e0763df57a4a082be682
This commit is contained in: