Change-Id: I4a1e51b6920b33dc892d447f5bd6d10f1cb2704a
Bug: http://b/20858755 Change-Id: I0d84e8b43dc33902d75af18db6b7c8e0b619d718 (cherry picked from commit 5624a6a1e5)
5624a6a1e5