fix merge of (refactor in prep for 4.3) commit

Change-Id: Ie425defd8073b8d42566b0947560db77e8ce0a31