[automerger skipped] Merge changes from topic "boot-splash" into pi-dev am: 59fda04bfd
am: 982dfc1e43  -s ours

Change-Id: I86d6e918d8d5b24e7f74c0e6ed19b492fdca9706