Merge changes from topic "cp_calin_framework_2017"
am: eb7ea99ab2

Change-Id: I95930174aba6b7fd17fa257aa04b587f74ed4701