Note the two "//TODO!" in the fix of the one newly found issue.

Change-Id: I181691da4b74cd55611452e002b37bd6798ff1e6