Merge changes from topic 'cm_request_to'
am: 6fb97e8fd8

Change-Id: I9ca18c0570be831ab37cdf200c28b0778117198d