Bug: 133776718 Test: manual & unittest Change-Id: I06b1e348e67d6283a482010d947bf749574d90f0
aa3689c4d9