The change above deleted these lines by mistake. Bug: 18153840 Change-Id: I010c36f227e313cdf00a363f1f851e61a4db1af4