Change License under the Apache License.
Change-Id: I28818a87403b8fe2a476d3fccdb0130a1e1f9683
Revert "Added Null Checks and Rearranged Source Code"
This reverts commit
8dd0b28603cdb0cc25664d7fc98a065bc94abee8.
Change-Id: I2be7d5d9f81803d7a935bd84f1ac4680ebb7dd0e