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