This patch aligns current code with AngularJS v1.8.2 requirements. Change-Id: Ifdad18e805953957bfaa1b42908dfbbe8976dbcb