Merge "Implement new splash screen API" into oc-dev am: 46ae660bf2
am: 27af670d9a  -s ours

Change-Id: I4f772359bf0dab72caa298597da2a995db463979