Merge remote-tracking branch 'aosp/upstream-github'

Changes (1) :
8ca1fe Fix tests for new test path

Change-Id: I68e8acd124cb4311da27f94e178cc4d17cbd77fd