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

Change-Id: I8939725e2e9590abe2652e0b5faa349c8d860244