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