Merge "Hide summary for type system" into oc-mr1-dev am: aadee0997c
am: da9247d645

Change-Id: I440fcbfea0cf934e68737eb5314739e397d80d88