Changes from patch set Icb93c79f4843b59dae80d3eda1a880457a1a68f2 Also some swaps from assertEquals to assertSame/True/False/Null Change-Id: Ife497ae6cb1888b77eb25e85b76df72adc65641a
Change-Id: I585f0f23cac5f6dc2a4879f69f7b83828fda3dd3
Change-Id: Ibcb37affa9ba1c891bc62964a3dd34b67214cfa1