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

Change-Id: Ie6b5c293b4ca17622674d5f735a9d62e04410088