e6d86e20aa
* There were two separate methods, which can run in any order. Consolidate to reduce variability Bug: 243688989 Change-Id: Ic924aa8a5d75505aecf6c830c63a85a0d2028d83