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

Change-Id: I9ef7d44793117b24cfdf601b2fe9a9f9be88cf74