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

Change-Id: Ia5d83ddaaca9893ce0ba253263d2fc757f40c4d4