Merge "Redact sensitive BL args in logs" into qt-dev am: a178afbe6a
am: 04ffa0507f

Change-Id: I1a75968df273118a378b1ec1264ca14292c78574