Merge "Add OWNERS in device/sample" am: 15f7857fc7
am: 11fe59454f

Change-Id: Ifed4056cc8fc9fb246fb1a4d5b48e758a9134ef6