(This is a merge of http://go/wvgerrit/70363) Test: Android Unit Tests Bug: 122953649 Change-Id: I47d2120b4d280be316072c38fd7282e14f68c6a0