Some inconsistencies still remained. Change-Id: Ic54af5433f6498488f457d8e49dae74e684e2bd2 Story: 1745294 Task: 8392