Merge "Add more repeat support and register views."
am: 1c8ac50fa9

Change-Id: I888843c96411ff7f4a088ef2ad2efc2386d41d31