[automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700 am: c79289a585 am: fbf27aaf20 -s ours
am skip reason: Change-Id I6b363bd609d580d547cb59851f5bfaba57ef7154 with SHA-1 7c62cbd97e is in history
Change-Id: I69eebcab794139a48e9977e8b0150da28747616c
This commit is contained in: