Bug: 36103813 Change-Id: Ie2e9938f6ae607f5fced5048c5ff5e41e4f7836b (cherry picked from commit e256bc9f)