Merge "Fix potential NPE from 326226"
am: d9a5fa50bd

Change-Id: I9be0cbcf8dcf5a8a9f31e8a59d191610864ae103