Merge changes from topic 'cm_request_to' am: 6fb97e8fd8
am: ede9f94e32

Change-Id: I2720e64e4af88df9d3a7b6209e9fcef4a0340986