Bug: 27874785 Change-Id: Ibb39087c5353a0cca7783d39498b370e478fe91c (cherry picked from commit 78f5eb04)