Bug: 20503707 Change-Id: I7e45012b34d57bad426d930399eb1afbf3f5f859
Bug: 18847144 Change-Id: I7bd98c381d8d58367862daedb7aaedfb0112b9d1