Taken from davinci, courbet, surya, sweet, and sweet2 Change-Id: Ie9bd3354d42a36e88004ee77343e0da5397a0eba