I20190327-1800
cause compilation errors even when not used - make test even meaner and implementation even safer Change-Id: I1c0db4a74ff39f946d28290b7e4fff2fb619b1db
cause compilation errors even when not used - make test even meaner and implementation even safer Change-Id: I1c0db4a74ff39f946d28290b7e4fff2fb619b1db