Merge changes I3e283232,Iee004bc2,Ie4d798c9,If977b4da am: dc8697e372 am: 31c838f039

Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1404707

Change-Id: If966dd0f4c7e00169740642957d8f1db98f0d8a1