tree 81f614f520aa3dafa27ce3d3debaf9e00eb33c21
parent 7918cf4e6b18ab1aa4dce1cb791bb88ec1f383d6
author Selim Gurun <sgurun@google.com> 1365117629 -0700
committer Selim Gurun <sgurun@google.com> 1365118261 -0700

DO NOT MERGE Fix issues during backport

Fix issues related to I219accd5db0c8a0e64b8aab3b049a8cee7dc168f.

Change-Id: Iacf72a9c618d59601c373de948a3f7cbfcbd7038