BUG-1258: Mark FIXME for implementation

This is not a fix, but rather a marker for the place in code where we
have enough information to improve efficiency.

Change-Id: I26838baed3a8e0769fecd0e56c4e8a974fe6c971
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "BUG-1258: Mark FIXME for implementation"