bug: 28342771 Change-Id: I73ee710928e4270ffe8212ca16b42d28b738949e (cherry picked from commit 8ac737db)