Merge "Remove leftover commented out code." am: 3399853809
am: 186637f2a4

Change-Id: I301b2e77675cef8572130f4a6f9e42a23669e1eb