Fixing Classifier Conflicts and Committing

Change-Id: I7a313097eb4bb933c46210112c096bbd2abcbb40
Signed-off-by: Reinaldo Penno <rapenno@gmail.com>