Bug 564142 Nebula 2.4.0 releng

Change-Id: I94d85a64d03aa92944eca4308b2023e30c1fb8fc