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

Change-Id: Ie1f0e4a770d55293854948ce5fc102aaac041f20