[automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be9...

[automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be9 am: cbe5bbdc am: 456b2bf8 am: b301288c am: 036496e2" into rvc-dev am: 61b66a28 am: c1f1682f -s ours am: 03e57ffd -s ours

am skip reason: Change-Id I6b363bd609d580d547cb59851f5bfaba57ef7154 with SHA-1 2b8bde16 is in history

Change-Id: I225ac40b48c65512c7ec594c80fa391599a728dd