Updates for Core Build.

Change-Id: I8720d5b57e335adde538838790c3ecdd465a7ed7
36 files changed