Again CM-12.0 rebase

Squashed

Change-Id: Ie90c461763090e06bf50ce6340020efbeecab4dc