Bug: https://code.google.com/p/android/issues/detail?id=187156 Change-Id: I5ee5e93b5e5b004f49e860047e4e2610b44e81d9 (cherry picked from commit bfc3cfdec5383ecbf04a5d5c98bd53304352ba1e)
Bug: https://code.google.com/p/android/issues/detail?id=187156 Change-Id: I5ee5e93b5e5b004f49e860047e4e2610b44e81d9 (cherry picked from commit bfc3cfdec5383ecbf04a5d5c98bd53304352ba1e)