Merge "Fix the potential NullPointerException." am: 4b5c8e1076 am: e15f92e37f
am: 590bf9a468

Change-Id: I62ba307387c2f6faff11ea44f86f3ea1c90c38a2