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

Change-Id: I9354043ccc00053dd214bb7bb8a878f88596c054