Merge commit '30429ac60e512453d4d7af212788819754b24691' into eclair-mr2 * commit '30429ac60e512453d4d7af212788819754b24691': Tiny code fix required for http://b/2260798 .
Merge commit '30429ac60e512453d4d7af212788819754b24691' into eclair-mr2 * commit '30429ac60e512453d4d7af212788819754b24691': Tiny code fix required for http://b/2260798 .