Bug: 19398878 Change-Id: Ieda7f8af590b297e0d083c312e2ea3c79012d87a (cherry picked from commit eaa03243)