Merge "Merge "Catch NPE and add more logging for a crash in Tile" into qt-dev am: 781ebfb059" into qt-dev-plus-aosp
am: 789ea433a7

Change-Id: I08efc424d10a469ecebe7673f356db22970983fc