I93296527981 follow-up + unit test 

Change-Id: I3e8203277603c3a27140314c0281433990c02ab2