92e451c1af
Addresses a pending comment given in commit cb793d013610e6905f58c823e68580714991e2df Change-Id: I7f0e88a78409dd4c57dbe20f9fc1d80cf625b529 Partial-Bug: #1712860