Merge "Remove out of date comment." am: 8a34e636ca
am: aeaade106d

Change-Id: I813e0a41f5e8df93d4dc319c77e3ac8beed20279