Bug: 28311085 (cherry picked from commit cb55b29e) Change-Id: I36ec3ef951ef9d2e5a9e60c0709cfeaf1210ddd0