tree d5b6159e66b70803e295c1d343e93d35b9dd7b9e
parent a06c9a4aef69ae27b951523cf72bf72412bf48fa
author Zach Jang <zachjang@google.com> 1456440473 -0800
committer The Android Automerger <android-build@android.com> 1456526349 -0800

Created as manual cherry-pick for http://ag/866007 to lmp-mr1-release

Change-Id: Ic7519c3f888c548446e5058a628c2d10bad1db6a