reconcile w/ CM... GENTLY.

Change-Id: I1218fbd39b4b44765038f0c148f494d4310b98ca