Bug: 19502687 Change-Id: Iaeceb290dbd2ba3f0db8e0cf3fb7f9b9ae4496ec (cherry picked from commit 2cb5729b)