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

Change-Id: I257f5c014908c5b16d6cf243efdd8d9e132bad50