Merge changes from topic "cp_calin_framework_2017" am: eb7ea99ab2 am: bb421005a1
am: 11f8c6e5da  -s ours

Change-Id: I30b16ddf4bb775c190d96198ed239d558c2311d1