Merge "bootstat: add salyzyn as owner" am: 8da7a1e6fd
am: 8138593f5a

Change-Id: Id3488bbe05d68cba7c61bacd8e28df1bab5dce37