Merge "SF:Report active config to java framework" am: 8e929406ee am: ee8a689009

Change-Id: Ifab555686857ecb66d1f99371be34f3d3c49611c