[automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be925
am: cbe5bbdcd5
am: 456b2bf87b
am: b301288cd7
am: 036496e2d0" into rvc-dev am: 61b66a28d9
am: 2a0dd6f700
am: 12952db603
am: 775ae6b0fd
-s ours
am skip reason: Change-Id I6b363bd609d580d547cb59851f5bfaba57ef7154 with SHA-1 2b8bde162f
is in history
Change-Id: Idc759300e365de090d27e82aababed0725831758
This commit is contained in: