Add strict config

Change-Id: I2c7386df7a3df0d53a083c8b90e7a737556f1c26