Merge "TIF: fix javadoc of recorded programs" into oc-dev am: a16d465a18
am: 790c4fbd0e

Change-Id: I8b4d61e25c5b0ddd80261def329587fb1cf82b32