J-176 @Beta API clean-up

Change-Id: I42cda376bba2ac46faadc96443e02dfbe57d2f0b
Signed-off-by: Marek Potociar <marek.potociar@oracle.com>
Merge "J-176 @Beta API clean-up"