Upstream obtained from existing git remote SEC-17 Change-Id: I9947465a2d3635ea127a71f1b1ae0fefc5738e57
