Merge "Random hacks to make QS DND work" into oc-dev
am: 28355df745

Change-Id: I71750f986834cf7391520f956cfec7183cc45758