Merge "hiddenapi: check for CorePlatform domain"
am: ca6d54388f

Change-Id: Ie5634ece54520b4ce95f7bab741a88297872c6c9