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

Change-Id: I7286ca72cb20fa4f0339caff22ca50cd7564d43e