Bug: 18226810. Change-Id: Ica5677da247268306b34dfce38f25394586817fd (cherry picked from commit b27a8a5b)