enable consistently passing UTs

Change-Id: I6e12558413ccd4a7479fb95cb2958b5309d16864
Merge "enable consistently passing UTs"