Merge "Add full support for initing registers." am: 1add237c8d
am: 66c61b545a

Change-Id: Ia7efe41ec442bda112cd928be3d5bd9051e6da9f