Merge commit 'e0c42dae95fd6bc6605875d697e105fa0dbdd0a0' * commit 'e0c42dae95fd6bc6605875d697e105fa0dbdd0a0': Tiny code fix required for http://b/2260798 .