Implement TODO(romainguy)

 Bug: 14277445

Change-Id: Id52d6f7fcc023000adcc440bd4da67d9a673536b
9 files changed