Test: make Bug: 130270919 Change-Id: I668680bcae8b0206f7b81c754b01825e7adfa8b2 (cherry picked from commit 9ac04e2f)