Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0

Bug: 150258187
Change-Id: I6b363bd609d580d547cb59851f5bfaba57ef7154
(cherry picked from commit 7c62cbd97ea9263167fd4520055dd09ef5b81350)
Merged-In: I6b363bd609d580d547cb59851f5bfaba57ef7154
1 file changed