Merge "Clarifying comments and todos, update current.txt." into oc-dev
am: f6470873f4

Change-Id: Iad1cbff7c4a787831f3f3ded7fbbeb3e8bae7453