Merge "LSE improvement: better singleton array optimization" am: e816389b61
am: fa2c0f228c

Change-Id: I0d66451da80a65a63a7333430a5a394624a7006e