bug/1272748 missed some lines

Change-Id: Ib9d9dffaf84f969cf75b756bf8ebad67a39fb8ee