Merge "Fix signature test issue caused by https://r.android.com/1613103" into sc-dev