[automerger skipped] Merge "Prevent NPE in CustomTile" into rvc-dev am:...
[automerger skipped] Merge "Prevent NPE in CustomTile" into rvc-dev am: c8bb1b32 am: 1b24ad3f -s ours am: e050a74d -s ours
am skip reason: Change-Id I0ee11806c0047e0e524f5201d369bee51beba451 with SHA-1 2648a2a9 is in history
Change-Id: If239cd929215b54dcbc6c87cd829c7ac1f9e7a85