DO NOT MERGE Fix issues during backport

Fix issues related to I219accd5db0c8a0e64b8aab3b049a8cee7dc168f.

Change-Id: Iacf72a9c618d59601c373de948a3f7cbfcbd7038
1 file changed