Bug: 305705597 Test: see the bug Change-Id: I06212b17ce10feed1e994fbddb1a3960d732cbd4 Signed-off-by: juyuchen <juyuchen@google.com>
based on 84d60a2e19d4ad09086067994d2f683ff86f6231 Bug: 263919239 Change-Id: I7be43786325116baddd35e182f87ad15fbe1a6ce