Closes-Bug: #2065769 Change-Id: Id0c7dc63e6dca5d32cf1cf8983588d44601b4338 (cherry picked from commit ae363bdf08)
ae363bdf08