[automerger skipped] Merge "SF:Report active config to java framework" am:...
[automerger skipped] Merge "SF:Report active config to java framework" am: 8e929406 am: ee8a6890 -s ours am: f09ba0ec -s ours
am skip reason: Change-Id I5bb964572d93e5cb78d7b75054b900917be563b0 with SHA-1 3f6a2062 is in history
Change-Id: Iec5c83d67a21280c1e217e2526fd1d12072b659c