BUG: Remove commentted content.

Change-Id: I28f1b0496bc343ce9c607503c8d854bbce0747f5
Merge "BUG: Remove commentted content."