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

Change-Id: Ica4cee335dcba58f16ac7b1ebd5f96e7211554db