Merge "Merge changes from topic "cp_calin_framework_2017" am: b98102b4dc am: b3da44d9a1 am: 5a0b4c4c62  -s ours"