Merge "Fix null deref crash" into nyc-mr1-dev am: fc9689e1ed am: fb20b5e13b
am: 3669d0fbc0
Change-Id: I5a26d8dbc662c4fea1fa998154178f281e776ccf
This commit is contained in:
fc9689e1ed am: fb20b5e13b
am: 3669d0fbc0
Change-Id: I5a26d8dbc662c4fea1fa998154178f281e776ccf