Merge \"Play boot sound on the System stream.\" into nyc-mr1-dev
am: 7d2f4cc750

Change-Id: I83cea2be8c0f4700eb9f1808b1e713e08b1f2ef3