am: 3744435
* commit '3744435859b91e1f50a5926c339db6869b908299':
Add a missing null object check
Change-Id: I0a620c6b17ddd66e6b84c1817292aef4b3bf010d
am: 3744435
* commit '3744435859b91e1f50a5926c339db6869b908299':
Add a missing null object check
Change-Id: I0a620c6b17ddd66e6b84c1817292aef4b3bf010d