[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: e25599c3 -s ours
am skip reason: Change-Id I0ee11806c0047e0e524f5201d369bee51beba451 with SHA-1 2648a2a9 is in history
Change-Id: I1982da8ea0e36d3442248327080e878dfc0d3bff