Change-Id: I111292a6a5a1eb9038906b73e19dce90f46d60f0 Closes-Bug: #1536805 (cherry picked from commit 8084c47946)
8084c47946