Merge "Trace: add ALOGVs for easier debugging" into klp-dev