DO NOT MERGE Use support toolbar in editor to fix issues in LMP am: bb1ab3cb54  -s ours
am: 12eef45c53  -s ours

Change-Id: Id3a64a710ad23b3d6342a17817f79ec9ca048127