Back-port fixes for b/62196835 am: fd0ca151a6
am: 3c4d24923c  -s ours

Change-Id: Ie8d7f1d4840bcea7538f99b2eb1bfb2bc472549f