many changes - matching CM

Change-Id: Ie7be1b55db5968609c269b54c0c7aeb367588fa1