Merge "Merge "Fixed NullPointerException" am: 5fb16be925
am: cbe5bbdcd5
am: 456b2bf87b
am: b301288cd7
am: 036496e2d0" into rvc-dev am: 61b66a28d9
am: 2a0dd6f700
Change-Id: I26dda4b26362bb94c48e1ad439af536d0353df16
This commit is contained in: