This patch need ag/15270810 to work. Test: N/A Bug: 193477495 Change-Id: Ied9317fed60f1fae5a0de76ed12aec723c20a0c2