Merge "Read the correct amount of attributes" into oc-dev am: 83aee7b3ba
am: c7706eef3e

Change-Id: Icede213590da36c16291cfa0fd001265f2728da4