The code relating to this patch can be seen in: I7096463c5eba951dd6322ee6965435e877ca0371 Partial-bug: #1633518 Change-Id: I297e138aca52ae10fbfaa50c79cf001fadaf557e