fa7ba6227f
Bug: http://b/20501816 Change-Id: Id64b5109cc2b165fa0351b6edbb865a5e5058008 (cherry picked from commit 4e8ef698d0d76be3f8d75de32701e6e6327c1fbd)