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

Change-Id: Icfbd3a667b8fd20e9676efa02ef537ee0ff2a20f