Sync the code with master branch

Test: I have test this functionality with my CTS Verifier app
Fixes: 184174925
Change-Id: Ia6e64019ed2deb777c513693f10ad78bec4fb0b4
1 file changed