[automerger skipped] Merge "Prevent NPE in CustomTile" into rvc-dev am:...
[automerger skipped] Merge "Prevent NPE in CustomTile" into rvc-dev am: c8bb1b32 am: eed6a477 am: 07d94616 am: 12e627c2 -s ours
am skip reason: Change-Id I0ee11806c0047e0e524f5201d369bee51beba451 with SHA-1 cfdd8d40 is in history
Change-Id: I6f241dd64c5750ddb9e2101c1721629f88454d57