Bug: 27830659 (cherry picked from commit 71498f10) Change-Id: I007ed563d78cdf36ddd0e36ae72f118189772e5c