I20161110-1630
tagged this
10 Nov 20:04
Reverting the patch for now due to reported DnD issues. This reverts commit 04862c5f2af9148ae0d045ae927e8d64de4bd5b4. Change-Id: I6ed464bd11241ba74d4daa7a375faab130748906