NXP-10886: add missing @since
NXP-10805: upgrade shindig to use guava
Merge branch 'master' into feature-NXROADMAP-127-DAM2