Merging motorola's patch to prevent crashes on view id mess up

issue: 15517526
Change-Id: Ib15b3dc2f5ed4e488f5d172ed02ccb72741d5980
1 file changed