Merge "Weaver HAL" am: 2f5a5e10f7
am: e3f5387b42

Change-Id: Iec3b2d31c58862819c0a1db9d8051f509731617b