Merge "[LayoutInflater] Cleanup - remove some nesting" am: 3a0fe2cdab am: a261d6e664
am: 6abf873683

Change-Id: I5b89a07c28f2d38af94a80137fd9a97d72b09091