Bug: 17412385 (cherry picked from commit b087849f) Change-Id: I3641d6649cddda82c36e52658bf6d743c6446935