Merge "Update checking of flag MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS" into pi-dev am: 15ebbeb9fd
am: 411e733a83

Change-Id: I1f12d9261b8c0f1f058f511129d98c6831f7a6c2