Bug: 19884954 Change-Id: I9a987c7bb0ab2a9d8b2ac870796969f073803d56 (cherry picked from commit d92c6bde)