Reusable components improvements

Change-Id: I23c3adde84775835d1d4fe9de239eb5ca5a9acbe
Merge "Reusable components improvements"