Merge "sthal: fix race condition of amp-ref route" into qt-r1-dev
am: cc990608ba

Change-Id: Ib4f89184ec5ecdc52071a4d629e8e16b9fdf46ee