Fix undefined index notice

Change-Id: I9062a36dcc11364174c4919de258c266a0e8fbb1
Merge "Fix undefined index notice"