DO NOT MERGE - Merge QQ2A.200405.005 into master am: f467291975

Change-Id: I222f321ea6c35ccc540a32973f87d4a8eba8d199