merge all changes from private git 12.234.32.41 to public git compass-core. Fix all broken tests caused by the code change.

Change-Id: I6b629d5cdb4ddf3a1a3eedb08fae37501e51ed09