Handle mandatory attributes

Change-Id: I68019e8e7d4b0c7a4fae8f97dcc7475c9e519cdb
Fixes-Bug: #1227004
Fixes-Bug: #1227038
Merge "Handle mandatory attributes"