Merge Some changes from CM and DirtyUnicorns.

Change-Id: Ie90fc362db44a014c2cba4364128e3de96aaeff6