BSN out of tree: back-port high priority patches

Back-port some high-priority patches to speed up
process of QA.

Change-Id: Ie0f6988f64843f1db67e6692537ae78849cf1753