Merge changes from topic "telecom-3p-cherry-pick" am: 876223c656
am: 0cd056fc9e

Change-Id: Iea9913b3039d234e9777ee66691552e5835961c5