Merge "Back-port fixes for b/62196835" into nyc-mr1-dev am: 4a1dc3458d
am: a84f7a3028

Change-Id: I1fedbee4642373e41c63c36ab83a0f4629c4a3d1