Code cleanup: [ '..' ] to ['']

Address FIXME

Change-Id: I0f42c06d084c9cce5094d4d499ca2c077714bbce
Merge "Code cleanup: [ '..' ] to ['']"